-
Notifications
You must be signed in to change notification settings - Fork 35
Add dockers to Fast and Basic Builds #1298
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
@lukaszstolarczuk |
|
||
# Dependencies for tests (optional) | ||
ARG TEST_DEPS="\ | ||
libnuma-dev" | ||
libnuma-dev \ | ||
libtbb-dev\ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Scalable pool relies on TBB library (src/pool/pool_scalable.c
), so this is an UMF dependency.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same as for libnuma - as long as you don't use that pool it's not required. Hence, I'd leave as test deps.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay
|
||
# Dependencies for tests (optional) | ||
ARG TEST_DEPS="\ | ||
libnuma-dev" | ||
libnuma-dev \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's requirement for OS memory provider, according to README.md
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As mentioned in the readme, it's for testing :)
While I agree with you that for runtime this is a requirement, it is not the hard requirement. As long as you don't use that provider it's not really required, hence we only mark this as "for testing" (or, in the user's case - for the application that uses the provider).
I'd personally leave libnuma as test deps.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay
.github/workflows/reusable_basic.yml
Outdated
|
||
env: | ||
BUILD_DIR : "${{github.workspace}}/build" | ||
INSTL_DIR : "${{github.workspace}}/install-dir" | ||
INSTL_DIR : "${{github.workspace}}/../install-dir" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe going outside the workspace is not the best idea.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
6039c67
to
b1d2ec2
Compare
@@ -1,10 +1,10 @@ | |||
# Copyright (C) 2024 Intel Corporation | |||
# Copyright (C) 2024-2025 Intel Corporation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pls order commits and add a proper commit title/message; while we're adding one new docker, the main change is something else 😉
pls also update the title of the PR, and if ready, please un-draft
@@ -20,21 +20,24 @@ ENV DEBIAN_FRONTEND noninteractive | |||
ARG BASE_DEPS="\ | |||
build-essential \ | |||
cmake \ | |||
git" | |||
git \ | |||
libtool" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we don't install hwloc from source on this image, libtool seems unneeded here...?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no, it is required in Build UMF
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm.. why?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
libtbb-dev" | ||
# Hwloc installation dependencies | ||
ARG HWLOC_DEPS="\ | ||
dos2unix \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no, removed
|
||
# Copy hwloc | ||
# libhwloc-dev is required - installed via script because hwloc version is to old on this OS | ||
COPY .github/scripts/install_hwloc.sh /opt/umf/install_hwloc.sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pls move this COPY step after all ARGs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay
libtool" | ||
|
||
# Copy hwloc | ||
# libhwloc-dev is required - installed via script because hwloc version is to old on this OS |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is too old
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
misspelling :D
if: matrix.compiler.cxx == 'g++-7' | ||
run: sudo apt-get install -y ${{matrix.compiler.cxx}} | ||
|
||
- name: Get UMF version |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why this step is removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
returned
.github/workflows/reusable_basic.yml
Outdated
@@ -192,7 +166,6 @@ jobs: | |||
-DUMF_DISABLE_HWLOC=${{matrix.disable_hwloc}} | |||
-DUMF_LINK_HWLOC_STATICALLY=${{matrix.link_hwloc_statically}} | |||
${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' && '-DUMF_USE_COVERAGE=ON' || '' }} | |||
${{ matrix.llvm_linker || '' }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why this is removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
returned
.github/workflows/reusable_basic.yml
Outdated
@@ -205,11 +178,14 @@ jobs: | |||
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }} | |||
LD_LIBRARY_PATH="${{env.BUILD_DIR}}/lib/:${LD_LIBRARY_PATH}" ctest --output-on-failure | |||
|
|||
- name: Set OS name | |||
run: echo "OS_VER=ubuntu-${{ matrix.ubuntu_ver }}" >> $GITHUB_ENV |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we set OS
and OS_VER
already within docker image
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay
.github/workflows/reusable_basic.yml
Outdated
- name: Check coverage | ||
if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }} | ||
working-directory: ${{env.BUILD_DIR}} | ||
run: | | ||
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-${{matrix.os}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}} | ||
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-${{env.OS_VER}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can't we still use matrix.os
here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes but now I have 'ubuntu_ver' variable in matrix. If it is important I can change the name
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
either add ubuntu
string here, or (preferably) bring back "os" var which contains full name of the os (as we will probably also add some fedora or other distros later on)
.github/workflows/reusable_basic.yml
Outdated
- name: Install oneAPI basekit | ||
if: matrix.compiler.cxx == 'icpx' | ||
run: | | ||
sudo apt-get update |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pls note sudo
is probably not passwordless on the docker, so e.g. use syntax like here: https://github.com/pmem/pmemstream/blob/master/utils/docker/prepare-for-build.sh#L20
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
because I ran docker as root it is not necessary to use sudo, so removed it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
according to sec. rules, we should not use root as the default user, that's why I believe sudo should be used if needed for a specific step
bb349f7
to
1779c51
Compare
Added UMF docker
// workflow executed on fork:
https://github.com/rbanka1/unified-memory-framework/actions/runs/14862004849/job/41730405890
Checklist